From ec14433f036b4487082c436d88847e858d9b2084 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 10 Jan 2019 12:27:03 +0000 Subject: [PATCH] Apply still-relavent part of 01-destdir.diff and remove part that is now upstream. --- Makefile | 2 +- debian/patches/01-destdir.diff | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 0aa14fe..d05cca7 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ LL2 = -L. -lpigpiod_if -pthread -lrt LL3 = -L. -lpigpiod_if2 -pthread -lrt -prefix = /usr/local +prefix = /usr exec_prefix = $(prefix) bindir = $(exec_prefix)/bin includedir = $(prefix)/include diff --git a/debian/patches/01-destdir.diff b/debian/patches/01-destdir.diff index c5a2276..3905e6e 100644 --- a/debian/patches/01-destdir.diff +++ b/debian/patches/01-destdir.diff @@ -9,20 +9,3 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin includedir = $(prefix)/include -@@ -90,13 +90,13 @@ - install -m 0755 pig2vcd $(DESTDIR)$(bindir) - install -m 0755 pigpiod $(DESTDIR)$(bindir) - install -m 0755 pigs $(DESTDIR)$(bindir) -- if which python2; then python2 setup.py install; fi -- if which python3; then python3 setup.py install; fi -+ if which python2; then python2 setup.py install --install-layout=deb --root=$(DESTDIR); fi -+ if which python3; then python3 setup.py install --install-layout=deb --root=$(DESTDIR); fi - install -m 0755 -d $(DESTDIR)$(mandir)/man1 - install -m 0644 *.1 $(DESTDIR)$(mandir)/man1 - install -m 0755 -d $(DESTDIR)$(mandir)/man3 - install -m 0644 *.3 $(DESTDIR)$(mandir)/man3 -- ldconfig -+ #ldconfig - - uninstall: - rm -f $(DESTDIR)$(includedir)/pigpio.h -- 2.30.2